[22.01] Backport and fix webapps tests #13478
+121
−101
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.